Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS>OUT_OF_RANGE", "Operand out of range, bitwise operation will lose information: {0}"); static final DiagnosticType SHIFT_AMOUNT_OUT_OF_BOUNDS = DiagnosticType.error( "JSC_SHIFT_AMOUNT_OUT_OF_BOUNDS", "Shift amount out of bounds: {0}"); static final DiagnosticType FRACTIONAL_BITWISE_OPERAND = DiagnosticType.error( "JSC_FRACTIONAL_BITWISE_OPERAND", "Fractional bitwise operand: {0}"); private static final double MAX_FOLD_NUMBER = Math.pow(2, 53); @Override Node optimizeSubtree(Node subtree) { switch(subtree.getType()) { case Token.CALL: return tryFoldKnownMethods(subtree); case Token.TYPEOF: return tryFoldTypeof(subtree); case Token.NOT: case Token.NEG: case Token.BITNOT: return tryFoldUnaryOperator(subtree); default: return tryFoldBinaryOperator(subtree); } } private Node tryFoldBinaryOperator(Node subtree) { Node left = subtree.getFirstChild(); if (left == null) { return subtree; } Node right = left.getNext(); if (right == null) { return subtree; } // If we've reached here, node is truly a binary operator. switch(subtree.getType()) { case Token.GETPROP: return tryFoldGetProp(subtree, left, right); case Token.GETELEM: return tryFoldGetElem(subtree, left, right); case Token.INSTANCEOF: return tryFoldInstanceof(subtree, left, right); case Token.AND: case Token.OR: return tryFoldAndOr(subtree, left, right); case Token.BITAND: case Token.BITOR: return tryFoldBitAndOr(subtree, left, right); case Token.LSH: case Token.RSH: case Token.URSH: return tryFoldShift(subtree, left, right); case Token.ASSIGN: return tryFoldAssign(subtree, left, right); case Token.ADD: return tryFoldAdd(subtree, left, right

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS> */ @SuppressWarnings("fallthrough") private Node tryFoldComparison(Node n, Node left, Node right) { if (!NodeUtil.isLiteralValue(left) || !NodeUtil.isLiteralValue(right)) { // We only handle non-literal operands for LT and GT. if (n.getType() != Token.GT && n.getType() != Token.LT) { return n; } } int op = n.getType(); boolean result; // TODO(johnlenz): Use the JSType to compare nodes of different types. boolean rightLiteral = NodeUtil.isLiteralValue(right); boolean undefinedRight = ((Token.NAME == right.getType() && right.getString().equals("undefined")) || (Token.VOID == right.getType() && NodeUtil.isLiteralValue(right.getFirstChild()))); switch (left.getType()) { case Token.VOID: if (!NodeUtil.isLiteralValue(left.getFirstChild())) { return n; } else if (!rightLiteral) { return n; } else { boolean nullRight = (Token.NULL == right.getType()); boolean equivalent = undefinedRight || nullRight; switch (op) { case Token.EQ: // undefined is only equal to result = equivalent; break; case Token.NE: result = !equivalent; break; case Token.SHEQ: result = undefinedRight; break; case Token.SHNE: result = !undefinedRight; break; case Token.LT: case Token.GT: case Token.LE: case Token.GE: result = false; break; default: return n; } } break; case Token.NULL: if (undefinedRight) { result = (op == Token.EQ); break; } // fall through case Token.TRUE: case Token.FALSE: if (undefinedRight) { result = false; break; } // fall through case Token.THIS: int tt = right.getType(); if (tt != Token.THIS && tt != Token.TRUE && tt != Token.FALSE && tt != Token.NULL) { return n; } switch (op) { case

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS> Id_export = Token.EXPORT, Id_false = Token.FALSE, Id_for = Token.FOR, Id_function = Token.FUNCTION, Id_if = Token.IF, Id_in = Token.IN, Id_new = Token.NEW, Id_null = Token.NULL, Id_return = Token.RETURN, Id_switch = Token.SWITCH, Id_this = Token.THIS, Id_true = Token.TRUE, Id_typeof = Token.TYPEOF, Id_var = Token.VAR, Id_void = Token.VOID, Id_while = Token.WHILE, Id_with = Token.WITH, // the following are #ifdef RESERVE_JAVA_KEYWORDS in jsscan.c Id_abstract = Token.RESERVED, Id_boolean = Token.RESERVED, Id_byte = Token.RESERVED, Id_catch = Token.CATCH, Id_char = Token.RESERVED, Id_class = Token.RESERVED, Id_const = Token.CONST, Id_debugger = Token.DEBUGGER, Id_double = Token.RESERVED, Id_enum = Token.RESERVED, Id_extends = Token.RESERVED, Id_final = Token.RESERVED, Id_finally = Token.FINALLY, Id_float = Token.RESERVED, Id_goto = Token.RESERVED, Id_implements = Token.RESERVED, Id_import = Token.IMPORT, Id_instanceof = Token.INSTANCEOF, Id_int = Token.RESERVED, Id_interface = Token.RESERVED, Id_long = Token.RESERVED, Id_native = Token.RESERVED, Id_package = Token.RESERVED, Id_private = Token.RESERVED, Id_protected = Token.RESERVED, Id_public = Token.RESERVED, Id_short = Token.RESERVED, Id_static = Token.RESERVED, Id_super = Token.RESERVED, Id_synchronized = Token.RESERVED, Id_throw = Token.THROW, Id_

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS> or in case this SourceFile came // from a Jar, it could be the path to the Jar. private String originalPath = null; // Remember the offset for the previous line query. If the next line // is after this point, we can start scanning at the previous offset rather // than starting at the beginning of the file. private int lastOffset; private int lastLine; private String code = null; /** * Construct a new abstract source file. * * @param fileName The file name of the source file. It does not necessarily * need to correspond to a real path. But it should be unique. Will * appear in warning messages emitted by the compiler. */ SourceFile(String fileName) { this.fileName = fileName; // Starting point: offset 0 is at line 1. this.lastOffset = 0; this.lastLine = 1; } ////////////////////////////////////////////////////////////////////////////// // Implementation /** * Gets all the code in this source file. * @throws IOException */ public String getCode() throws IOException { return code; } /** * Gets a reader for the code in this source file. */ public Reader getCodeReader() throws IOException { return new StringReader(getCode()); } @VisibleForTesting String getCodeNoCache() { return code; } private void setCode(String sourceCode) { code = sourceCode; } public String getOriginalPath() { return originalPath != null ? originalPath : fileName; } public void setOriginalPath(String originalPath) { this.originalPath = originalPath; } // For SourceFile types which cache source code that can be regenerated // easily, flush the cache. We maintain the cache mostly to speed up // generating source when displaying error messages, so dumping the file // contents after the compile is a fine thing to do. public void clearCachedSource() { // By default, do nothing. Not all kinds of SourceFiles can regenerate // code. } boolean hasSourceInMemory() { return code != null; } /** Returns a unique name for the source file. */ public String getName() { return fileName; } /** * Gets the source line for the indicated line number. *

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS> * @param lineNumber the line number, 1 being the first line of the file. * @return The line indicated. Does not include the newline at the end * of the file. Returns {@code null} if it does not exist, * or if there was an IO exception. */ public String getLine(int lineNumber) { String js = ""; try { // NOTE(nicksantos): Right now, this is optimized for few warnings. // This is probably the right trade-off, but will be slow if there // are lots of warnings in one file. js = getCode(); } catch (IOException e) { return null; } int pos = 0; int startLine = 1; // If we've saved a previous offset and it's for a line less than the // one we're searching for, then start at that point. if (lineNumber >= lastLine) { pos = lastOffset; startLine = lastLine; } for (int n = startLine; n < lineNumber; n++) { int nextpos = js.indexOf('\n', pos); if (nextpos == -1) { return null; } pos = nextpos + 1; } // Remember this offset for the next search we do. lastOffset = pos; lastLine = lineNumber; return (js.indexOf('\n', pos) == -1) ? null : js.substring(pos, js.indexOf('\n', pos)); } /** * Get a region around the indicated line number. The exact definition of a * region is implementation specific, but it must contain the line indicated * by the line number. A region must not start or end by a carriage return. * * @param lineNumber the line number, 1 being the first line of the file. * @return The line indicated. Returns {@code null} if it does not exist, * or if there was an IO exception. */ public Region getRegion(int lineNumber) { String js = ""; try { js = getCode(); } catch (IOException e) { return null; } int pos = 0; int startLine = Math.max(1, lineNumber - (SOURCE_EXCERPT_REGION_

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS>LENGTH + 1) / 2 + 1); for (int n = 1; n < startLine; n++) { int nextpos = js.indexOf('\n', pos); if (nextpos == -1) { break; } pos = nextpos + 1; } int end = pos; int endLine = startLine; for (int n = 0; n < SOURCE_EXCERPT_REGION_LENGTH; n++, endLine++) { end = js.indexOf('\n', end); if (end == -1) { break; } end++; } if (lineNumber >= endLine) { return null; } if (end == -1) { int last = js.length() - 1; if (js.charAt(last) == '\n') { return new SimpleRegion(startLine, endLine, js.substring(pos, last)); } else { return new SimpleRegion(startLine, endLine, js.substring(pos)); } } else { return new SimpleRegion(startLine, endLine, js.substring(pos, end)); } } public static SourceFile fromFile(String fileName, Charset c) { return fromFile(new File(fileName), c); } public static SourceFile fromFile(String fileName) { return fromFile(new File(fileName)); } public static SourceFile fromFile(File file, Charset c) { return new OnDisk(file, c); } public static SourceFile fromFile(File file) { return new OnDisk(file); } public static SourceFile fromCode(String fileName, String code) { return new Preloaded(fileName, code); } public static SourceFile fromCode(String fileName, String originalPath, String code) { return new Preloaded(fileName, originalPath, code); } public static SourceFile fromInputStream(String fileName, InputStream s) throws IOException { return fromCode(fileName, CharStreams.toString(new InputStreamReader(s, Charsets.UTF_8))); } public static SourceFile fromInputStream(String fileName, String originalPath, InputStream s) throws IOException { return fromCode(fileName, originalPath, CharStreams.toString

Closure, 148

<FILEB>
<CHANGES>
      case Token.VOID:
        typeNameString = "undefined";
        break;
<CHANGEE>
<FILEE>
<FILEB>
<CHANGES>
  private final static int UNMAPPED = -1;
<CHANGEE>
<CHANGES>
    int id = UNMAPPED;
<CHANGEE>
<CHANGES>
    boolean used = false;
  }
  private class MappingWriter {
<CHANGEE>
<CHANGES>
    private String lastSourceFile = null;
    private String lastSourceFileEscaped = null;
    private int lastLine = 0;
    private String lastLineString = String.valueOf(0);
<CHANGEE>
<CHANGES>
    private void appendMappingTo(
        Mapping m, Appendable out) throws IOException {
<CHANGEE>
<CHANGES>
      String sourceFile = m.sourceFile;
<CHANGEE>
<CHANGES>
      String escapedSourceFile;
      if (lastSourceFile!= sourceFile) { // yes, s1!= s2, not!s1.equals(s2)
        lastSourceFile = sourceFile;
        lastSourceFileEscaped = escapeString(sourceFile);
      }
      escapedSourceFile = lastSourceFileEscaped;
      out.append(escapedSourceFile);
<CHANGEE>
<CHANGES>
      int line = m.originalPosition.getLineNumber();
      if (line!= lastLine) {
        lastLineString = String.valueOf(line);
      }
      String lineValue = lastLineString;
      out.append(lineValue);
<CHANGEE>
<CHANGES>
      out.append(String.valueOf(
          m.originalPosition.getCharacterIndex()));
      if (m.originalName!= null) {
<CHANGEE>
<CHANGES>
        out.append(escapeString(m.originalName));
<CHANGEE>
<CHANGES>
      out.append("]\n");
<CHANGEE>
<CHANGES>
    void appendMappings(Appendable out) throws IOException {
      for (Mapping m : mappings) {
        if (m.used) {
          appendMappingTo(m, out);
        }
      }
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    mapping.sourceFile = sourceFile;
<CHANGEE>
<CHANGES>
      mapping.originalName = originalName;
<CHANGEE>
<CHANGES>
    if (offsetPosition.getLineNumber() == 0
        && offsetPosition.getCharacterIndex() == 0) {
      mapping.startPosition = startPosition;
      mapping.endPosition = endPosition;
    } else {
<CHANGEE>
<CHANGES>
    }
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    int maxLine = prepMappings();
<CHANGEE>
<CHANGES>
    (new MappingWriter()).appendMappings(out);
<CHANGEE>
<CHANGES>
  private int prepMappings() throws IOException {
<CHANGEE>
<CHANGES>
    (new MappingTraversal()).traverse(new UsedMappingCheck());
<CHANGEE>
<CHANGES>
    int id = 0;
    int maxLine = 0;
    for (Mapping m : mappings) {
      if (m.used) {
        m.id = id++;
        int endPositionLine = m.endPosition.getLineNumber();
        maxLine = Math.max(maxLine, endPositionLine);
      }
    }
<CHANGEE>
<CHANGES>
    return maxLine + prefixPosition.getLineNumber();
  }
  private class LineMapper implements MappingVisitor {
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private int lastId = UNMAPPED;
    private String lastIdString = UNMAPPED_STRING;
<CHANGEE>
<CHANGES>
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
      throws IOException {
      int id = (m!= null)? m.id : UNMAPPED;
      if (lastId!= id) {
<CHANGEE>
<CHANGES>
        lastIdString = (id == UNMAPPED)? UNMAPPED_STRING : String.valueOf(id);
        lastId = id;
      }
      String idString = lastIdString;
      for (int i = line; i <= nextLine; i++) {
        if (i == nextLine) {
          for (int j = col; j < nextCol; j++) {
            addCharEntry(idString);
          }
          break;
        }
        closeLine();
        openLine();
      }
    }
<CHANGEE>
<CHANGES>
      (new MappingTraversal()).traverse(this);
<CHANGEE>
<CHANGES>
      closeLine();
    }
<CHANGEE>
<CHANGES>
    private void openLine() throws IOException {
      if (out!= null) {
        out.append("[");
        this.firstChar = true;
      }
    }
<CHANGEE>
<CHANGES>
    private void closeLine() throws IOException {
      if (out!= null) {
        out.append("]\n");
      }
    }
<CHANGEE>
<CHANGES>
    private void addCharEntry(String id) throws IOException {
      if (out!= null) {
        if (firstChar) {
          firstChar = false;
        } else {
          out.append(",");
        }
        out.append(id);
      }
    }
  }
<CHANGEE>
<CHANGES>
  private class UsedMappingCheck implements MappingVisitor {
<CHANGEE>
<CHANGES>
    @Override
    public void visit(Mapping m, int line, int col, int nextLine, int nextCol)
        throws IOException {
      if (m!= null) {
        m.used = true;
      }
    }
  }
  private interface MappingVisitor {
<CHANGEE>
<CHANGES>
    void visit(Mapping m, int line, int col, int endLine, int endCol)
        throws IOException;
  }
<CHANGEE>
<CHANGES>
  private class MappingTraversal {
<CHANGEE>
<CHANGES>
    private int line;
    private int col;
    MappingTraversal() {
    }
<CHANGEE>
<CHANGES>
    void traverse(MappingVisitor v) throws IOException {
      Preconditions.checkState(!mappings.isEmpty());
<CHANGEE>
<CHANGES>
          maybeVisit(v, previous);
<CHANGEE>
<CHANGES>
        maybeVisitParent(v, parent, m);
<CHANGEE>
<CHANGES>
        maybeVisit(v, m);
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
<CHANGEE>
<CHANGES>
    private void maybeVisit(MappingVisitor v, Mapping m) throws IOException {
<CHANGEE>
<CHANGES>
        visit(v, m, nextLine, nextCol);
<CHANGEE>
<CHANGES>
    private void maybeVisitParent(MappingVisitor v, Mapping parent, Mapping m)
<CHANGEE>
<CHANGES>
      int nextLine = getAdjustedLine(m.startPosition);
      int nextCol = getAdjustedCol(m.startPosition);
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line < nextLine || col <= nextCol);
      if (line < nextLine || (line == nextLine && col < nextCol)) {
        visit(v, parent, nextLine, nextCol);
      }
<CHANGEE>
<CHANGES>
    private void visit(MappingVisitor v, Mapping m,
        int nextLine, int nextCol)
<CHANGEE>
<CHANGES>
      Preconditions.checkState(line <= nextLine);
      Preconditions.checkState(line < nextLine || col < nextCol);
<CHANGEE>
<CHANGES>
        Preconditions.checkState(false);
<CHANGEE>
<CHANGES>
      v.visit(m, line, col, nextLine, nextCol);
<CHANGEE>
<FILEE>

<FILEB> } String typeNameString = null; switch (argumentNode.getType()) { case Token.STRING: typeNameString = "string"; break; case Token.NUMBER: typeNameString = "number"; break; case Token.TRUE: case Token.FALSE: typeNameString = "boolean"; break; case Token.NULL: case Token.OBJECTLIT: case Token.ARRAYLIT: typeNameString = "object"; break; <CHANGES> <CHANGEE> case Token.NAME: // We assume here that programs don't change the value of the // keyword undefined to something other than the value undefined. if ("undefined".equals(argumentNode.getString())) { typeNameString = "undefined"; } break; } if (typeNameString != null) { Node newNode = Node.newString(typeNameString); originalTypeofNode.getParent().replaceChild(originalTypeofNode, newNode); reportCodeChange(); <FILEE> <FILEB> import com.google.common.collect.Lists; import com.google.javascript.rhino.Node; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.List; /** * Collects information mapping the generated (compiled) source back to * its original source for debugging purposes. * * @see CodeConsumer * @see CodeGenerator * @see CodePrinter * * * @author johnlenz@google.com (John Lenz) */ public class SourceMap { <CHANGES> <CHANGEE> /** * A mapping from a given position in an input source file to a given position * in the generated code. */ static class Mapping { /** * A unique ID for this mapping for record keeping purposes. */ <CHANGES> int id; <CHANGEE> /** * The input source file. */ String sourceFile; /** * The position of the code in the input source file. Both * the line number and the character index are indexed by * 1 for legacy reasons via the Rhino Node class. */ Position originalPosition; /** * The starting position of the code in the generated source * file which this mapping represents. Indexed by 0. */ Position startPosition; /** * The<SCANS>(new InputStreamReader(s, Charsets.UTF_8))); } public static SourceFile fromReader(String fileName, Reader r) throws IOException { return fromCode(fileName, CharStreams.toString(r)); } public static SourceFile fromGenerator(String fileName, Generator generator) { return new Generated(fileName, generator); } ////////////////////////////////////////////////////////////////////////////// // Implementations /** * A source file where the code has been preloaded. */ static class Preloaded extends SourceFile { Preloaded(String fileName, String code) { this(fileName, fileName, code); } Preloaded(String fileName, String originalPath, String code) { super(fileName); super.setOriginalPath(originalPath); super.setCode(code); } } /** * A source file where the code will be dynamically generated * from the injected interface. */ static class Generated extends SourceFile { private final Generator generator; // Not private, so that LazyInput can extend it. Generated(String fileName, Generator generator) { super(fileName); this.generator = generator; } @Override public synchronized String getCode() throws IOException { String cachedCode = super.getCode(); if (cachedCode == null) { cachedCode = generator.getCode(); super.setCode(cachedCode); } return cachedCode; } // Clear out the generated code when finished with a compile; we can // regenerate it if we ever need it again. @Override public void clearCachedSource() { super.setCode(null); } } /** * A source file where the code is only read into memory if absolutely * necessary. We will try to delay loading the code into memory as long as * possible. */ static class OnDisk extends SourceFile { private final File file; // This is stored as a String, but passed in and out as a Charset so that // we can serialize the class. // Default input file format for JSCompiler has always been UTF_8. protected String inputCharset = Charsets.UTF_8.name(); OnDisk(File file, Charset c) { this(file); if (c != null) { this.setCharset(c); } } // No Charset provided?